From 6d799c5b570362d218ad6b91929252a7c9c175f6 Mon Sep 17 00:00:00 2001 From: Steven Hand Date: Fri, 20 Apr 2007 15:29:11 +0100 Subject: [PATCH] Fix dist target to keep previous symlink format. May be a cleaner fix which I'll let IanC do. Signed-off-by: Steven Hand --- linux-2.6-xen-sparse/arch/i386/Makefile | 2 +- linux-2.6-xen-sparse/arch/i386/boot-xen/Makefile | 4 +--- linux-2.6-xen-sparse/arch/x86_64/Makefile | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/i386/Makefile b/linux-2.6-xen-sparse/arch/i386/Makefile index d6d0f45999..07af557f9e 100644 --- a/linux-2.6-xen-sparse/arch/i386/Makefile +++ b/linux-2.6-xen-sparse/arch/i386/Makefile @@ -125,7 +125,7 @@ vmlinuz: vmlinux $(Q)$(MAKE) $(build)=$(boot) $@ install: - $(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@ + $(Q)$(MAKE) $(build)=$(boot) $@ else all: bzImage diff --git a/linux-2.6-xen-sparse/arch/i386/boot-xen/Makefile b/linux-2.6-xen-sparse/arch/i386/boot-xen/Makefile index bf15a77094..da9f7614c4 100644 --- a/linux-2.6-xen-sparse/arch/i386/boot-xen/Makefile +++ b/linux-2.6-xen-sparse/arch/i386/boot-xen/Makefile @@ -12,10 +12,8 @@ INSTALL_ROOT := $(patsubst %/boot,%,$(INSTALL_PATH)) XINSTALL_NAME ?= $(KERNELRELEASE) install: mkdir -p $(INSTALL_ROOT)/boot - ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(XENGUEST)$(INSTALL_SUFFIX) - rm -f $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) install -m0644 vmlinuz $(INSTALL_ROOT)/boot/vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) install -m0644 vmlinux $(INSTALL_ROOT)/boot/vmlinux-syms-$(XINSTALL_NAME)$(INSTALL_SUFFIX) install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX) install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX) - ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX) + ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(shell cat ./localversion-xen)$(INSTALL_SUFFIX) diff --git a/linux-2.6-xen-sparse/arch/x86_64/Makefile b/linux-2.6-xen-sparse/arch/x86_64/Makefile index 055b315abb..b45be59f02 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/Makefile +++ b/linux-2.6-xen-sparse/arch/x86_64/Makefile @@ -91,7 +91,7 @@ vmlinuz: vmlinux $(Q)$(MAKE) $(build)=$(boot) $@ install: - $(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@ + $(Q)$(MAKE) $(build)=$(boot) $@ else #Default target when executing "make" all: bzImage -- 2.30.2